File Structure Fixed - Despaghetized
Merge branch 'master' of https://github.com/mKontakis/Sensebox