Modularizing our models, views and collections