handle internals and data directories with new scheme
Authored by: berndspeiser 2014-06-21
Parent: [r1270]
Child: [r1272]
