put scripts in folders

also minor goal changes