cleaned up, renamed templates.
remove junk, fix metadata
start getting tags/filters setup
merge