removed obsolete stuff
moved files
removed obsolete stuff