Working on 1.6 update & re-organize project organization