cleaned folder structures

Signed-off-by: Daniel <dnfagnan@gmail.com>