[Refactoring] A big refactoring
Merge pull request #1 from boogunote/big_refactoring

[Refactoring] A big refactoring