small restructuring. Mock files moved to test/mocks folder, some light changed introduced to cake file