* Streamlined the project structure