New version of all files that's tested and merged