Restructure theme to base