Re-organize options
Add proper tdir to scripts