migrated pikkerton service to clean structure