Added model/collection structure

Also included a connect class fix.