lots of cleanup. deleted designtest app and moved all the templates and views to their appropriate locations (with the execption of analytics)