Added layout mapping
Finished data generation more or less.
Merge branch 'feature/datagen' into develop