Removed and Renamed File, Fixing more merge problems.