Changed around some packaging again.

I changed the way some methods are handled and you might also notice
that some methods and variables have been refactored.