updated to get command line organization