Fixed imports as some changed in the Shared project