Remove subprojects
Re-add bundles not as sub projects