Refactored package names and added class to handle command line parsing.