Fixed issues according to SensioLabsInsight #2

Mappings for entities are now done by YAML files, to prevent code duplication
Also services dont have the container injected directly