Move locations and add more settings related classes