Lots of changes
File templates