wip #13 a lot of rearranging classes
wip #13 deletd old proj left from refactor