More PEP8, renaming packages to make it easier to stay under 80 chars per line.