Cleaned up and readded files to the master branch