rename a few things to closer resemble underlying structure
cleanup
0.0.1