Added base and project folders