Refactoring stracture of the project