Refactored into a different folder.