restructure core theme folder