added CLItool + updated pom + reorganize files to match this