Remove test folder and renamed Application Service