Merge pull request #83 from brainstorm/master

Rename files to more intuitive ones, easing newcomers adoption