Maven 3 compatible

Removing cycle dependencies, adding version