Reworked the source tree AGAIN! Back to C!
Minor changes to some scripts