Rearrangement of python files