Move stuff from files into templates