Added multi-directory capability to the framework


Signed-off-by: dmarjos <dmarjos@gmail.com>