fix setup and manifest for new structure