Update code to PSR4 class loader standard