Move generator to adama package
Fix bug when not passing a name