Restructure and autoloading.