Added some files and renamed others