Reorganize code, cleanup , plus batch adding organizations, command line