moved lines to not make shares service an extension

Change-Id: Ia0976111837b761c3051c51156e6c90d38da8a13
fixed tests

Change-Id: Ic6fa94849b2400c9bd1341783d511850599a4096