Reorganize sources.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	todo.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master'