Move code into more maven-friendly package