Moved similar to owner directories. Refactored queries to use starting points.