Initial ServerApp and ClientApp commit, for new design