Add modular assets, reorganize templates