tech debt: commands refactored into individual files