Changing structure & adding PyDoc