temporarily adding a few OSMB structures
new core files, other files reorg