Fix setup to match new structure