- Some other structures changed for better understanding

Signed-off-by: mobinzk <mobin.zk@3men.co.uk>