moving to git; cleanup; wip