Refactoring a few classes. I have activation fully working, throttling checking (but not adding), Swift Identity working with swipe (working on SMS).

Signed-off-by: Ben Corlett <bencorlett@me.com>