Rearranged repository to prepare for templates