Fix various issues, remove files, improve sample.
Allow make_sub_dirs to be used in config.py