theme folder restructuring