Updated templates to be modular (like they should be).