[cvs-nhc98] patch applied (nhc98): Reverse the dependency order between filepath and directory packages