Directory refactored continued. Updated scripts.