Cleaning up

Doing some clean up of files and next work item will be to get the CRUD
of locations finished.