Further restructuring, adding osb.metadata & osb.resources