0.6 to 0.7:

        Inconsistent naming of files and module corrected.
        Thanks to Mike Castle.