Updates

Changed structure. Added gps test