Rerragned everything

broke everything for a more sane structure, will fix tommorow