Merge "Move project's exception file to subdir"