Refactored due to move of pkgtool to std/felix