Begin re-structuring code