Project structure re-structured