Fixed the project's structure to be more maintainable