Add some organization...
Still can't figure out how to get the template files to render properly...