Adjusting the project structure for future implementations