Fixed wrong require on packages (there was a circular dependency)