Started refactoring to project into packages
Finised refactoring into different modules