Removed FILE_DIR for sub-directories