Refactor tools into separate package