Happier with the new structure
started to refactor existing code