Fix imports and pom.xml files
making a bloody mess
diff minification