Removed fetching of subjects from the network client

Refactored class and function names to be more understandable