Refactoring project to become more similar to generator-element