Refactored Toolkit path