Made Generator a class rather than a project