This should be the last

At least until @jadar decides how it should work. Also... clean up your imports.
Fixed some private stuff that should be protected.