Moved code around to get a little more clean packages (without the help
of super-packages)