more moving of files
move final files, fix dependent modules