Remove reference to deprecated class
Move package to com.atoito.clap