#74: Cleanup project structure and build process cleanup.

Fixed broken import caused by moving test cases to separate package.