Project structure changed (modules created), refactoring