Added support for multi-directory projects