Updated module structure for python.