Major refactoring to achieve clearer inheritance
Moved classes into folders Helpers, QueryItems, Repository