move more functions into bin