Mergers __main__ module fix
Merges update: transformed to classes
Main module update