reorganize assets and base template