Refactored project structure. Implemented image locator.