Move Content and Layout modules into the core