flatten the namespace
cleanup test directories, correct .Leap refs
rebase and build