File naming conventions

Simplifies import of the module (now a single file is needed).

![ ](http://media3.giphy.com/media/Sy5KyHSCgtimc/giphy.gif)