Block refactoring

Block refactoring
@see: https://github.com/prestaconcept/PrestaCMSCoreBundle/issues/48