Refactoring, organizing and code cleanup

[LeanKhan]

Let's organize the project betterly and refactor code if necessary.

[LeanKhan]

We will do this at the end of this phase.