Changed feature and created retriever classes
First scenario completed with end to end feature
optimised imports