cleanup, refactor, project restructuring, most if not all dANN tests seem to pass.