Refactoring alot to improve file sizes
Merge pull request #6 from apocist/dev

Refactoring alot to improve file sizes