re-factoring for 1.3: /lib, /models, /concerns, /services, Rails 3 syntax, other code cleanup