Moved a few common classes. Also update pom.