Improve naming
Add initial location file