Start reorganising code for enhanced sanity