Reorder source code + add simpler data model for news items