Re-organization of core UIkit files