Move specific labels to appropriate modules; test updates