Reorganizing Project

** PLEASE BACKUP YOUR PROJECT FILES**
I am making reorganizing all code and classes. There will be some
serious problem so saving code can be life-saver. I make my own copy
too.

- Working propertly in tests.