Cleanup, renames, arguments to scripts, organization; done for now.