Small refactoring
Some more refactoring
Separate STGUploadedEntry from STGDataCaptureEntry.