Create frameworks, modernise some stuff