Added layers go under GPSLayer unless otherwise specified

Fixes #33