Rename things for repo change
Fix bootstrap to work with new structure