reorganised pom's, fix bugs