Make overriding easier

Moved model and controller concerns into lib directory.