Removed the original directories
Added two templates