one more refactor to make it easier to add this project as a dependency in eclipse/pydev
this commit finishes the refactor to allow this project to be added as a dependency in eclipse/pydev