restructure

theme files restructure