Introduced additional 'Links' class and refactored all classes to clean-up the approach.