Rearrange the code.
Refactoring worked.
Got a lot of the refactoring done.
Released version 1.
Merge branch 'develop'