Changing directory structure

Signed-off-by: Borislav Angelov <borislav.angelov@gmail.com>