Updated project structure from base project