Update code structure, and tweak some stuff (trivial).