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