Tidy up demo files, clone symfony style.