Refactor to use some OO benefits
Setting version to 2.0.0
Setting version to 2.0.1-SNAPSHOT