Restructure theme at base of repo