more file structure corrections to match namespace and have spl autoload work