rebuilt file structure, rm theme wrapper