banish models/
banish models/
Almost done with #4.
lots more refactoring. #4