Move theme into default subfolder
Break out universal helpers into system