Reorganization of current files and template creation

Info gathering still needs work and there is some left over on the bottom of it, but just wanted to get this out there before dropping off.