Updates to code structure