Removed template configs and renamed files