Combined CMS-client & CMS-admin into Skivvy_simple
cleaned up skivvy_simple, and renamed several items