arrange .py files
Merge remote-tracking branch 'origin/develop' into master_2