Re-organisation of Remote Service helper project