Move themes into directory
Rename files to work with rcm