Moved generators to seperate files and moved utils to plugin