reorganize, check in to test on system with gmp
add out-of-sync files