cleaned up app and moved service to class library