migrate to maven dir structure