Changes on project structure