Re-organise of files pending addition of web interface.