#24 - fresh copies of the library, remove circular dependencies
Merge pull request #25 from tgriesser/dependency-refactor

#24 - fresh copies of the library, remove circular dependencies