Modular structure refactor
Router + templates refactor