Moved more paths and stuff to objects