Major restructuring of the codebase, deleted unused source code