restructuring

Signed-off-by: dev0x10 <dev.yauri@gmail.com>