Some re-arranging of files and tweaking the config.