reorg directory and add bin tests