minor model stuff
Move stuff around, change dependencies accordingly