Update program structure.
Merge branch 'master' of https://github.com/shirdrn/python.git