Refactoring the project some more