misc: fix directory structure and pom