Make more modular
Merge pull request #1 from robivanknobi/master

Make it more modular