Refactored services into different files.
Switched all dates to Joda.