Refactoring and moving to new package
Adding comments and removing unneeded icon code
Massive cleanup and commenting
Massive cleanup and commenting
Commenting and cleanup
Merge remote-tracking branch 'origin/dev-gradle' into dragon-drop-cleanup