Improved: random check
Changed: restructured pom.xml