Issue #9: re-organzing/cleaning up scripts