Moving files to more appropriately scoped sub-directory