Removed and renamed some files