Reorders functions and adds __init__.py