Refactoring Selectors class into Interest

Code compiles, but is not yet working properly
Fixing introduced bugs. Now all test cases are working.