Fixed some imports and added to pom.xml