Revert "Cleanup"

This reverts commit 699371ceac5d0d977f3281479dae55616a8376b7.
Revert "Add start of unit tests, reorg to accomadate..."

This reverts commit cad01410c309c376e2bbefdfa4721cce464304d9.
Revert "Add partially implemented parser class"

This reverts commit bd0095b030dc4d730eafcb186816333e7869452e.