Block refactoring

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