Restructure the theme to be in a single deployable directory