Organised stuff slightly. Haven't uploaded GPS