Aram & Mattia - reorganize the project structure