Updates to code and structure