Rearrange code dealing with layout files
Split into loading and parsing.
The file got too big to navigate, and "data" on its own was a pretty lousy file name anyway, to the point that I had to think before I realized where the parsing happened.
WIP: it's based on !448 (merged)
Edited by Dorota Czaplejewicz