removed old stuff
renaming