Minor fixes

Minor fixes on pom and general structure