Created proper package and __main__