reorganize imports and 1.5.8 as pom