Added simple argument handler

Changed package names.