Move to ZF 1.12.1 and recommended directory structure