Reorganize OS1 and update it to current ops code