Updated some unit tests, renamed a few directories, updated documentation