re-organized sql scripts.
TODOs added.