refaktoring package names and few changes to avm generation