refactored folder structure to conform to ZF2 naming conventions