restructuring progress #1

Signed-off-by: bravocado <bravocado.project@gmail.com>
restructuring progress #2
new structure.

Signed-off-by: bravocado <bravocado.project@gmail.com>