Fixed Client Build Structure

Repaired problems in client after previous commit.