Renaming directories and moving files around
More changes related to reorganization; figures output by first script