Splitting into templates and tidy
Added missng files