Rework file layout