Moved files.
Added a couple very trivial unit tests.