Refactored locations and surveys modules into own modules