Modifications in organization and directory structure