Move source to toplevel, remove useless verbose options and pad help