First modularized config
Merge pull request #1 from lucas624/modularize

First modularized config