Improved article detector
Refactored data in separate modules