Updated directory reorganization