big restructure. Added model/collection providers.