Abstracted away Service + DB for tests. Now tests can be easily created.
Minor cleanup - organized classes into packages.