Moved location State folder in header files
Renamed functions to begin with a lower case
Commented out unusual function