move things and add autoloader