moved files, updated to 2.0
build