Refactored RestService into package service, moved Spec along. Optimized import