Move main autoload to Class based syntax