Fixed OBS update issue, refactored code, uploaded sample files