Finished refactor with failing unit tests.
Updated README.
Finised reorg.