Fixed a failing test.
Re-structured project a bit.
Comment.