Fixing autoloader so there's no conflicts.