Created refactored client file
Merge pull request #129 from leebyp/frontendRefactor

Created refactored client file