Cosmetics, etc.
Massive move...
Merge pull request #14 from vhordejcuk/master

MoRe