Change python module structure