[cleanup] Make some cleanup about folder hierarchies and pom

Also bump version to 4.0.0