Add Autoloader and removed namepaces