Move some wrappers into the right place and comment the meaning of the wrapper files names.