Move files around. Make more PEP8 compliant.