So far only done scripts directory, will do the rest if this is considered good
Let's see if it works out, if not, we can revert it.