Move to services folder

Hi folks,

I'd like to move the services so far created from app/models to app/services, as that is what they are.  I'm also making the naming/API more consistent (both internally and according to Rails standards/best practices).  There's also some very minor spec cleanup (e.g., better variable names).