Refactor - Stage 1
Merge branch 'refactor' of https://github.com/Gautham/daux.io into refactor