redo dir structure
update comments
update comments, add files