raw3-3 updates

old structure!