reorganize code of non-flat reader a bit
Authored by: thibautd 2014-09-08
Parent: [r30176]
Child: [r30178]