py: Rename files, remove hyphes, it is unpythonic