Removed unnecessary files and some renaming