Remove BASEDIR and use relative paths