Updated craft-base to a more intuitive and robust structure.