Refactored to a python project