Revised folder file structure for site theme and revise dwh_pages fields