inital structure vol 2.1

at least it compiles now