diff --git a/src/inquirer/Makefile b/inquirer/Makefile
similarity index 100%
rename from src/inquirer/Makefile
rename to inquirer/Makefile
diff --git a/src/inquirer/inquirer.go b/inquirer/inquirer.go
similarity index 100%
rename from src/inquirer/inquirer.go
rename to inquirer/inquirer.go
diff --git a/src/inquirer/registration/registration.go b/inquirer/registration/registration.go
similarity index 100%
rename from src/inquirer/registration/registration.go
rename to inquirer/registration/registration.go
diff --git a/src/inquirer/responder/responder.go b/inquirer/responder/responder.go
similarity index 100%
rename from src/inquirer/responder/responder.go
rename to inquirer/responder/responder.go
diff --git a/src/loader/kyoto/Makefile b/loader/kyoto/Makefile
similarity index 100%
rename from src/loader/kyoto/Makefile
rename to loader/kyoto/Makefile
diff --git a/src/loader/kyoto/kyoto_loader.go b/loader/kyoto/kyoto_loader.go
similarity index 100%
rename from src/loader/kyoto/kyoto_loader.go
rename to loader/kyoto/kyoto_loader.go
diff --git a/src/loader/kyoto_loader.go b/loader/kyoto_loader.go
similarity index 100%
rename from src/loader/kyoto_loader.go
rename to loader/kyoto_loader.go
diff --git a/src/loader/redis/Makefile b/loader/redis/Makefile
similarity index 100%
rename from src/loader/redis/Makefile
rename to loader/redis/Makefile
diff --git a/src/loader/redis/redis_loader.go b/loader/redis/redis_loader.go
similarity index 100%
rename from src/loader/redis/redis_loader.go
rename to loader/redis/redis_loader.go
diff --git a/src/rater/Makefile b/rater/Makefile
similarity index 100%
rename from src/rater/Makefile
rename to rater/Makefile
diff --git a/src/rater/rater.go b/rater/rater.go
similarity index 100%
rename from src/rater/rater.go
rename to rater/rater.go
diff --git a/src/rater/registration/registration.go b/rater/registration/registration.go
similarity index 100%
rename from src/rater/registration/registration.go
rename to rater/registration/registration.go
diff --git a/src/rater/storage/interface.go b/rater/storage/interface.go
similarity index 100%
rename from src/rater/storage/interface.go
rename to rater/storage/interface.go
diff --git a/src/rater/storage/kyoto_storage.go b/rater/storage/kyoto_storage.go
similarity index 100%
rename from src/rater/storage/kyoto_storage.go
rename to rater/storage/kyoto_storage.go
diff --git a/src/rater/storage/redis_storage.go b/rater/storage/redis_storage.go
similarity index 100%
rename from src/rater/storage/redis_storage.go
rename to rater/storage/redis_storage.go
diff --git a/rater/timestamps/timestamps.go b/rater/timestamps/timestamps.go
new file mode 100644
index 000000000..f950045a5
--- /dev/null
+++ b/rater/timestamps/timestamps.go
@@ -0,0 +1,33 @@
+package main
+
+import (
+	"time"
+)
+
+type BilingUnit int
+
+type RatingProfile struct {
+	StartTime time.Time
+	ConnectFee float32
+	Price float32
+	BillingUnit BilingUnit
+}
+
+type ActivationPeriod struct {
+	ActivationTime time.Time
+	RatingProfiles []RatingProfile
+}
+
+type Customer struct {
+	Id string
+	Prefix string
+	ActivationPeriods []ActivationPeriod
+}
+
+const (
+	SECONDS =iota
+	COUNT
+	BYTES
+)
+
+
diff --git a/src/loader/kyoto/kyoto_loader b/src/loader/kyoto/kyoto_loader
deleted file mode 100755
index 186103a2e..000000000
Binary files a/src/loader/kyoto/kyoto_loader and /dev/null differ
diff --git a/src/loader/redis/redis_loader b/src/loader/redis/redis_loader
deleted file mode 100755
index 5309355b5..000000000
Binary files a/src/loader/redis/redis_loader and /dev/null differ
diff --git a/src/rater/storage.kch b/src/rater/storage.kch
deleted file mode 100644
index 64541140e..000000000
Binary files a/src/rater/storage.kch and /dev/null differ
diff --git a/src/rater/timestamps/timestamps.go b/src/rater/timestamps/timestamps.go
deleted file mode 100644
index 07b6e58e7..000000000
--- a/src/rater/timestamps/timestamps.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package main
-
-import (
-	"time"
-)
-
-type Rating struct {
-	ConnectFeeIn time.Time
-	PriceIn float32
-	ConnectFeeOut time.Time
-	PriceOut float32
-}
-
-type Customer struct {
-	Id string
-	Prefix string
-}
diff --git a/src/test/test b/src/test/test
deleted file mode 100755
index eb939d3b3..000000000
Binary files a/src/test/test and /dev/null differ
diff --git a/src/test/Makefile b/test/Makefile
similarity index 100%
rename from src/test/Makefile
rename to test/Makefile
diff --git a/src/test/sj.py b/test/sj.py
similarity index 100%
rename from src/test/sj.py
rename to test/sj.py
diff --git a/src/test/test.go b/test/test.go
similarity index 100%
rename from src/test/test.go
rename to test/test.go
diff --git a/src/test/test.py b/test/test.py
similarity index 100%
rename from src/test/test.py
rename to test/test.py
diff --git a/src/test/test2.py b/test/test2.py
similarity index 100%
rename from src/test/test2.py
rename to test/test2.py