Refactor the project. Phase 5: AspectDetector