Cleaned up PYC files
Another restructuring, because I can't make up my mind.