#11 Correct framework-factory package structure