wip
updated bin
updated structure