Removed and renamed redundant files.