Refactored a good portion of all classes to reflect a better setup. It is much more clean now.
Cleaned up imports, this was what CodeNarc was complaining about.
Removed the stupid import that was failing the Travis build.
Merging