removed redundant files and renamed some files