Merge pull request #24 from abdulrauf/master

Massive code refactoring
Merge branch 'master' of https://github.com/Gluttonberg/core