Organized the structure to a lot more modular template