Transitioning everything to new structure!
many heavy changes, still a real work in progress