Rearranged stuff into the proper folder.
Added everyone else's proposals, and the template, back in.  Sorry guys, I wasn't paying attention.