more scripts and reoragnization