removed unused files, some renaming