Refactoring of Genesis before building Heinzite