Updated folder structure

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