Deleted unnecessary interfaces , inserted interfaces into the code,
created some new methods in moves to make the interface smaller and
updated test for these changes