Rearranged file structure, added mockobjects and interfaces for mockobjects, started writing unit tests.