Adding control-state and m4 folder