rewrited the generator and deleted unnecessary files