Fixed template paths after rename, removed unnecessary junk from models (some of it)