Reordered solution into client/server. Also added support to deploy separately.