Changed folder organization to be more PyPi-ish.