structure of directories changed.
Tests added.
Tests faked to run correctly.