Fix service objects structure
Refactor BE