Refactor of file layout to consolidate