Move runsql and the vapi files to their own directories