Move 'structure' to 'data'
Put magma, etc. under structure dir