make it float on mosml again

Some renaming to achieve
1) one signature per file
2) signature and structure have same names
3) names do not only differ in letter case
remove conflict