use autoload instead of file includes

fix more issues