moving to KD internal storage structure
Merge branches 'wip' and 'storage' into wip