Updated to new LIMBO package structure