Refine API

Following the suggestion in !1 (merged) an the talk after it, a couple things need to be done:

• Consolidate the object used to provide information as a service (Credentials -> User)
• Remove the "alternate" way of providing this information