Remove old template engine files.
Reorganize packages.