Organized imports and fixed pom.xml addon dependencies