file move only refactoring
Merge pull request #1173 from devoncarew/devoncarew_service_refactor

file move only refactoring