- Move command/option definitions to separate files
- More tests
- Job refactored