Clean-up and new structure for commandline entrypoints for separate functionality.