Re-arrange the sample config, update .gitignore