rearranve gor maven dir structure