moved files
Lots of changes. See comments