Renaming files and remove useless code