Should the files maybe get renamed from "base-desktop"  to "desktop" for the core?