remove old todo, refactor bin structure