Reorganization

Signed-off-by: accardi80 <antonioaccardi80@gmail.com>