More fixes for news page
Reorganised SQL files. Can now run just setup.sql to drop database and import all data