Overhaul code-base
Overhaul of all files
Merge branch 'develop'
Merge develop into master