A lot of refactoring: class Layout and OtherFile