A major rework, transforming the software into a library