moved templates around
deleted some temlates