refactored structure

Signed-off-by: Guyzmo <guyzmo+github@m0g.net>