fix basedir and file locations