Moved `old` to `-old`, some interface improvements, licence sanitization.