Shift518 W.o.T.

i did a little reorganizing