Re-arranged a little, and added support for PyPi install.