Updated structure of base project