Added autoload classes & singleton pattern