Changed directory structure

Signed-off-by: Yuval Ziegler <YuvalZiegler@gmail.com>