Finally moved services into cms bundle :/