Refactor and merged all progress into a single document