Remove unnecessary directory sep

Signed-off-by: Paul de Wouters <paul@hmn.md>
Refactored the class

Signed-off-by: Paul de Wouters <paul@hmn.md>
fixed merge conflicts

Signed-off-by: Paul de Wouters <paul@hmn.md>