More build/craft refactoring