Restructure
Also adapt evaluate module
Add mmt