Merge branch 'release/realease-1.2' into develop
bug fix, rename files to almost match the class names
bug fix, rename the files back to what they should be
bug fix, rename directories to almost the same to allow for case changing
bug fix, rename the directories back to remove the 1
bug fix: licence copyright update
Merge branch 'release/1.3.0'