Tidied up files around erb templates
Futher tidied files