Cleaned up and moved some templates
Spent hours figuring out cart validation, theme was broken #fail. Will add tomorrow!