Better structure

Still testing but this is looking MUCH better...