Deleting to fix something will be back
Mass refactor and import cleanup!
Merge pull request #2 from Sparkst3r/Development-2

Development 2 Mass refactor and stuff + import cleanup