Move scripts into bin
Better error handling and logging