Add folder 7 with some extra refactoring
More refactoring