Improved command line option; renamed package for core logic.