Prevent nested activate
Restructure vim files