Moved interfaces out into a project

Extracted some interfaces and then fixed tests