Tidy up of scripts so they are all together.
Tidy up of system files