Better organisation of wit file.