move stuff around
nested relationship joining
move classes around
fix namespace imports