convert to current mw standard, +code cleanup
fix file names
Merge pull request #2 from onei/master

convert to current mw standard, +code cleanup