Renamed files and removed redundant ones.