file layout reorganization