Changed the project structure to allow for better modularization