Reorganize things some more - Split-up argument parser as well