Shell and demo moved out of matrix dir