Re-factor theme contents into base directory