Updated project for new structure