AYECM-41 Client app modularizing and refactoring
 - overall client refactoring
Merge branch 'master' into release