Restructuring
Removing massive amount of warnings, mainly unused imports.
Merge remote-tracking branch 'origin/master'